From: Tim Deegan <Tim.Deegan@xensource.com>
Date: Wed, 12 Sep 2007 08:58:16 +0000 (+0100)
Subject: [XEN] Fix assert in typed p2m code
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14937^2~93
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=59b9df263cdf8b287f1a5d0f1dfd77069195a213;p=xen.git

[XEN] Fix assert in typed p2m code
as spotted by GCC-4's enthusiastic warnings.
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
---

diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h
index 0febce28f4..ff00bbd4fa 100644
--- a/xen/include/asm-x86/p2m.h
+++ b/xen/include/asm-x86/p2m.h
@@ -119,7 +119,7 @@ static inline mfn_t gfn_to_mfn_current(unsigned long gfn, p2m_type_t *t)
 
         if ( ret == 0 ) {
             p2mt = p2m_flags_to_type(l1e_get_flags(l1e));
-            ASSERT(l1e_get_pfn(l1e) != INVALID_MFN || !p2m_is_ram(*t));
+            ASSERT(l1e_get_pfn(l1e) != INVALID_MFN || !p2m_is_ram(p2mt));
             if ( p2m_is_valid(p2mt) )
                 mfn = _mfn(l1e_get_pfn(l1e));
             else